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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad26205fed43fd9082c8995e65592e89d3a64dde