Merge "Convert src/main/Android.mk to Android.bp" am: 3c3a5d95b6 am: 8184c3c810

Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1690211

Change-Id: I25e2744b0bea9fbfedf6b6d8a413554ed987ea62