Merge changes from topic "am-2c480354c5314718960fe4d0b2502426" into tm-mainline-prod am: 5bae0b07

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



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