Merge "Revert "OMS: add tests for the OMS transactional API"" am: 78a3fdfbed

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e78a895a3c245e9faf07ce166aaa662b4703d75