fe62154c33
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16507258 Change-Id: Iee952b6738dfc181fd382a30c65ec9fdc9a50f20