Merge "[MultiDisplay] Convert the Android.mk to Android.bp" am: 171b02e636 am: 1a8376f7e7 am: b7e2afa99d
am: 2c60fea7cb

Change-Id: I644d079c8c5b3333378d1efbfca13c09e062ec27