cdf6b4202c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1343444 Change-Id: Ib2a16bd545b98a8d95338f6acce23e265ec5130a