8c9a2645d8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1436852 Change-Id: Ief2520cd30059542ae3786a36b92198af6739a2a