Merge "[automerger skipped] Merge "Hold onto occluded change until it's...

Merge "[automerger skipped] Merge "Hold onto occluded change until it's committed" into tm-qpr-dev am: 0cbdbb64 am: ba2cbd95 -s ours" into udc-dev am: 2428df9b -s ours

am skip reason: Merged-In I7d3ac020db34d8a15d18b25de07231bda83cbcf0 with SHA-1 52d80538 is already in history

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



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