[automerger skipped] Merge "Hold onto occluded change until it's committed" into tm-qpr-dev am: 0cbdbb64c8 am: ba2cbd95f0 -s ours am: 48aa9c4593 -s ours am: be3a5c391b -s ours
am skip reason: Merged-In I7d3ac020db34d8a15d18b25de07231bda83cbcf0 with SHA-1 52d8053880 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22177534
Change-Id: I840f5488478abcc0cff8ed0fc1cccfaea91d25ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: