Merge changes from topic "api-review-result-receiver" am: b7de235729 am: 9fd8b3411c

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

Change-Id: I1f4772fbc0aedb40d015e11a16672f627f50e4e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>