[automerger skipped] Merge "Convert more of frameworks/base/packages to Android.bp" am: 25fff4828a -s ours am: 122f77dbac -s ours
am:649965cdc5-s ours am skip reason: change_id I851b819030a1da6091f5d6125a228bb01a99011b with SHA120bc2bf3f6is in history Change-Id: Id47bb7c3b015b0165596864217aabc76de3195de
This commit is contained in: