Merge changes from topic "presubmit-am-a4905c0263fe4b63a3e22407af07914e" into sc-mainline-prod am: 3a2dd589

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

Change-Id: I18b524809cf97ec6472da7a0377cabf2ef41684e