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

[automerger skipped] RESTRICT AUTOMERGE Revert "Hold onto occluded change until it's committed" am: 98dc3986 am: 49a253fc -s ours am: 91a6014b -s ours am: b330269b -s ours

am skip reason: subject contains skip directive

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



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