Merge "DO NOT MERGE: Only restore the positions of types which are controlled" into rvc-qpr-dev am: 9649d433d0

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

Change-Id: I25bceed195462dcc77839b9f21433873f2dafa52