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

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

Change-Id: Idf6755a90a95fb2180842da9dc704c45d8d9176a