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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a7d5d6c65b5dd9531f155cc4403c8e5d2ed136b