Merge "Replace is-board-platform[-in-list] with is-board-platform[-in-list]2" am: 1bec2aa709 am: bc59b5092c

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

Change-Id: Ib1d337c3ffdad76e975bf46d6458599b007db472