Merge changes from topic "caitlinshk-csi-wakeupifdozing" into udc-qpr-dev am: ac3b6993

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



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