Merge "[automerger skipped] Merge "Revert "Add multi-user support for...

Merge "[automerger skipped] Merge "Revert "Add multi-user support for AutoTileManager"" into rvc-dev am: 3616fd63 am: d2862c23 -s ours am: ed87d2e4 -s ours" into rvc-qpr-dev-plus-aosp am: ac536b9d -s ours

am skip reason: Change-Id I518334cca0a0960e0b3b74b43ac9fce4610c7bd0 with SHA-1 31a266d5 is in history

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

Change-Id: I63a8f5f4291ee9c6fc779daff01a0873d67a91a4