Merge "Merge "Fix AutoTileManagerTest" into pi-dev am: c7a25dc939" into pi-dev-plus-aosp