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

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

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



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