[automerger skipped] DO NOT MERGE: Downbranch don't need this adjustment am: dc84c190 am: 487b0c6f -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id5e2c1d8f0f712af446720d98bec087d169d4803