b79ae17835
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620860 Change-Id: I2600965b38f3039c0cca1c39d294ad9665aeab17