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