Merge changes from topic "presubmit-am-4e3490788a4149ecafa6355f55df347b" into tm-mainline-prod am: b3a07d47

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

Change-Id: I6f7e0d5c167edecf095c93dff6306d57f7b1f737