Start removing Current state am: 6a160319a4 am: 7e8e1a0dee

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/14604498

Change-Id: I9c431224a28de3733c6f1f7967e61467de9e6635