[automerger skipped] Merge "Merge "[hbm] Separate HBM times for multi-display...

[automerger skipped] Merge "Merge "[hbm] Separate HBM times for multi-display devices." into tm-qpr-dev am: 0acdb31c" into tm-qpr-dev-plus-aosp am: 912786a2 -s ours

am skip reason: Merged-In I0ed4ad99108a1a850dae68e1f6cf92adfab8bc1d with SHA-1 ac86b481 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20925772



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