[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: 66d11c2a7e -s ours
am skip reason: change_id I851b819030a1da6091f5d6125a228bb01a99011b with SHA1 20bc2bf3f6 is in history

Change-Id: Ia2032d4f125fb0ce6bbe0e6c74079e27a9447bd3