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