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