Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455077 Change-Id: Iaa21befaf4c9221634917f98c0aece773b9e8149