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

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

Change-Id: I6cc18bee29a289085834e439938452ff7184d553