e584943ca1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644202 Change-Id: Ia47e8efc3cc3f40b396c0aa0bd49afea2385e9c3