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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c9be5b9bd85ea9a54b06b1b39a8d89e8d96206c