2dc94a3183
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1591453 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2f2448f544f687ea7119045ead91315d339770a2