Merge "Replace is-board-platform[-in-list] with is-board-platform[-in-list]2" am: 46138bfe3e am: 5c0efe0e17 am: 308bc9262a

Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/media/+/1871917

Change-Id: I0d230967a6ca5ff9d7df7c23fb9411a8401fc9da