36ff42e508
07f6ff7138
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11620914 Change-Id: I3fe08b0644b62b05987c4eb628264645b09a9e12