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

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

Change-Id: I7d9060ed4720e77485eb1773bbfcc56cb2d782e8