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

Change-Id: Ie43d32ce0fab600fee3498d16591d57ad176e76c