[automerger skipped] Merge "Avoid unnecessary dup" into sc-v2-dev am: 102271f7 am: 884b6dde -s ours

am skip reason: Merged-In I43ab5c25f5b3abdec236c0a78a03a197ad2d0da2 with SHA-1 78c2f631 is already in history

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

Change-Id: I24916d0ae6562f4b65b44a93aafcd662719ad3e4