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

Change-Id: I22111e8cc929e0baf290eba489b82a89ac192ee4