Merge changes from topic "caitlinshk-dock-defend-initial" into tm-qpr-dev am:...

Merge changes from topic "caitlinshk-dock-defend-initial" into tm-qpr-dev am: 87971425 am: 5bbd3ec3

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



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