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

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

Change-Id: I626f0bc2b8410b0276f5aa204e8b13e26c7c2236