cdf210fd71
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1302435 Change-Id: If732bcf0706801b4823c6f77231c832cbdbcc242