Merge changes from topic "presubmit-am-b480a938e1a74bd1a08c92e592efe11e" into tm-mainline-prod am: bb0084cc

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

Change-Id: I277df6239c456738578334798918a60bc31f5f32