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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6aa33aa183bb845497b33922b13a4be25d7592b3