Merge changes from topic "revert-1507500-oms-transactional-api-UQLIXJBEPB" am: 2c2853d09e am: 547beff356

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I36bafb9d958e7ae88c8110b3a6d89a39a9e73241