9660f4811b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675890 Change-Id: Id534f0ec692848bbb6c99074bcd4a7e92c0df9ce