Merge changes from topic "presubmit-am-9d60724bb97c420bb007fe87d46f9b78" into tm-mainline-prod am: 6e398877

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

Change-Id: Iee11a8cde95d0b00f8c005ad024995ec6ea06935