Merge changes from topic "presubmit-am-d5aeba84add64a9a9dd59331ecf1ff06" into sc-qpr1-dev am: effda996

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

Change-Id: I4252faaf17d1bd3998a7cf4486d03dd0aa9f71a4