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

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

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



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