Original change: https://android-review.googlesource.com/c/platform/development/+/1914228 Change-Id: I7a7c71438880823616a1e696dde71fbfc25a9375
Original change: https://android-review.googlesource.com/c/platform/development/+/1914228 Change-Id: I7a7c71438880823616a1e696dde71fbfc25a9375