b357fadd1e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705633 Change-Id: I20f9e94bb3241e07052edbe8c042162c2ad6f118