Merge "[automerger skipped] Merge "Revert "Add multi-user support for AutoTileManager"" into rvc-dev am: 3616fd6330 am: d2862c2335 -s ours am: ed87d2e4e7 -s ours" into rvc-qpr-dev-plus-aosp