Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12246826 Change-Id: I0d09aeb6fa583aff43485575b361dbfe662a4673