Merge changes from topic "presubmit-am-b11993ce014a4666b0f088209adcf077" into tm-mainline-prod am: f158af33

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

Change-Id: I08fc1c98a27e11df2965a7e8a3cc0a84bbacee34