Merge changes from topic "presubmit-am-48e8246e8960485fa279b808afc4be97" into sc-mainline-prod am: 34e94a3591
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16924500 Change-Id: Ibb21e8a40c15e746062fedff46dc698ae9467822
This commit is contained in: