2071ba6540
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2003030 Change-Id: I81949778980ddf2515bbab52abb0daf51a6c0c44