[automerger skipped] Merge "RESTRICT AUTOMERGE Revert "Hold onto occluded...

[automerger skipped] Merge "RESTRICT AUTOMERGE Revert "Hold onto occluded change until it's committed"" into tm-qpr-dev am: 27235319 am: 83097c1f -s ours am: 6ffe1437 -s ours am: bd3da911 -s ours

am skip reason: subject contains skip directive

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



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