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