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