Merge "Convert Development/Android.mk to Android.bp" am: d0e60e25c2 am: 14b78ea954 am: 9e20f8da4a

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

Change-Id: Iff74b686ec591b477fe949003f3b7bfe398576ed