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

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



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