Merge changes from topics "caitlinshk-nssl-resetuser",...

Merge changes from topics "caitlinshk-nssl-resetuser", "caitlinshk-nssl-snooze" into udc-qpr-dev am: 407c2828

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



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