Merge "Convert MultiDisplay/Android.mk to Android.bp" am: 9e504cc4c5 am: 45950f4fc4

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

Change-Id: I7a24591841b7a54d9ba967cd19452da334686b76