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