[automerger skipped] Merge "Avoid unnecessary dup" am: c333d989 am:...

[automerger skipped] Merge "Avoid unnecessary dup" am: c333d989 am: 8ad20ea9 am: 93336d96 am: 2b79adf0 -s ours am: b70c676d -s ours

am skip reason: Merged-In I43ab5c25f5b3abdec236c0a78a03a197ad2d0da2 with SHA-1 7c55b433 is already in history

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

Change-Id: Ia16771f949e990553a01979f7f21b55045b7258e