Merge TP1A.221005.003 am: 8b218acf92

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

Change-Id: I948f34f6a5f878a29a051c51d19cded1aa8a37c7
Signed-off-by: Automerger Merge Worker <[email protected]>