DO NOT MERGE: Only restore the positions of types which are controlled am: a496e03194

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

Change-Id: If603ca5fe0c6e7b1ba8e19868875a9390a28d89a