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

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

Change-Id: I7c537ebd807eaaf06b3464d748fee1385bad0110