Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15080916 Change-Id: I467554e26a215d65429c02e76de61e79f0f39483