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