Merge "Fix dependencies of packages that target earlier releases" am: bde4c9a8df
am: c44dd5a879
-s ours
Change-Id: I08f18c4bf6f373548509882f55d1161b35fc752a
main
commit
dec3c3d02b