470e9e0e19
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626204 Change-Id: I8648b09a97485dcecac2e5075d605e79a730ec3f
dcc2fb2a19