Merge "Avoid unnecessary dup" into sc-v2-dev am: 102271f702

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

Change-Id: I6443b46a5fd69baa0db18e2d70b615ebc259e055