Merge changes from topic "oms-transactional-api" am: b9ba6a8d0f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia78fd94156fd6ac0cfc3239234eee63822c9e260