DO NOT MERGE: Downbranch don't need this adjustment am: 19987ee056

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

Change-Id: Ida2e4e542918ad427a721833b0c1d2adb0a49e18