cfacebd651
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322377 Change-Id: I5e28537689d1a53e99f91eafd494eb3a0c890f46