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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I86fe58cbbd953d3553f5c6c74ee1207f6499733f