Merge "[automerger skipped] Merge "Revert "Add multi-user support for AutoTileManager"" into rvc-dev am: 3616fd63 -s ours am: 302db9a7 -s ours" into rvc-d1-dev-plus-aosp