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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia1a8da0d862aca3b6944c3eab58ac82dd602b594