fea1cc6976
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1909972 Change-Id: I086290e4e858ed48b323b39a90a8775db43cb298