Merge "Hold onto occluded change until it's committed" into tm-qpr-dev am: 0cbdbb64

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



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