Snap for 8474198 from 4f7d38b549e32db02329f61b1eaf5b7798c4f14a to tm-release am: fc158e3958

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

Change-Id: I9aae5b9bd3558539b81b7a31c2b7cb1fb23a8cf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>