Merge "Fix side channel leakage from the api of overrideLabelAndIcon" into sc-dev am: 6b6917944d am: 3686f41b03
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14881016 Change-Id: I470e5d4b59f33641c97e05c1770b869402e13cb8
This commit is contained in: