Merge changes from topics "caitlinshk-csi-getdisplayid",...

Merge changes from topics "caitlinshk-csi-getdisplayid", "caitlinshk-csi-wakeupforfsi" into udc-qpr-dev am: 49caf0e8

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



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