Merge "Convert Android.mk to Android.bp" am: 64b8511941

Original change: https://android-review.googlesource.com/c/platform/development/+/1689112

Change-Id: I8a4c4bd0590aba47449d7c6212d2b81c086f4337