[automerger skipped] Merge "DO NOT MERGE: Only restore the positions of types which are controlled" into rvc-qpr-dev am: 9649d433d0 am: a0fc352ae2 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I452d04fef066e6871d791ffffa7fa720f9bfd360