Merge changes from topic "presubmit-am-2625b945aa174137b2b2b5d408d07175" into tm-mainline-prod am: d158f0d7

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

Change-Id: I6543b0c3bf6f27bd452e65790e6c5b639f7d925f