53018b429c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1321319 Change-Id: I5f8be07aef5fa478b81a8198e3109fa33eab6bdd