[automerger skipped] DO NOT MERGE: Downbranch don't need this adjustment am: 19987ee056 am: f21a415901 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4a5e4be615e9956870bf73865edc5c1feb52c85b