Merge "Revert "OMS: add transactional API"" am: 7facc4ec41 am: ba88e64636

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d5bf83f5d5ce2600084e4c2be28199ffe78db22