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

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

Change-Id: I025dc6a47dc1e11e6f01f392c65b6a60b8a0734c