Merge "Ensure transaction is applied if added after SSG is complete" into udc-dev am: 032a31aa

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



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