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

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

Change-Id: I33fa569c81f4684b784b5cf999098b3b89112d3d