Merge changes from topic "presubmit-am-6e2d2013d117441baf471cd8f74a86ef" into sc-mainline-prod am: 6a943bf7b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16238718 Change-Id: I3e656222ec346540ce9866555b14905c9b3de319
This commit is contained in: