[automerger skipped] Merge "Convert more of frameworks/base/packages to...

[automerger skipped] Merge "Convert more of frameworks/base/packages to Android.bp" am: 25fff482 -s ours am: 122f77db -s ours am: 649965cd -s ours am: 66d11c2a -s ours
am: 5567fc42 -s ours
am skip reason: change_id I851b819030a1da6091f5d6125a228bb01a99011b with SHA1 20bc2bf3 is in history

Change-Id: I98bbc92a080766fe4c8987da74a764778c0d72f6