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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I83f0956b56a93fff302170997735450fa0adf087