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