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

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

Change-Id: I233f2c5cea9ef78f64d963c4a9d10234723a6676