Merge "Hold onto occluded change until it's committed" into udc-dev am: e9945c0d

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



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