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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8e88ddf57a29aeed73157801e29a8379f6bea79c