…MERGE
This fixes a bug where the view hierarchy in AccountUnlockScreen was being
modified by the async callback thread from AccountManager.
DO NOT MERGE because path has changed.
Change-Id: I32a7b5df8ade3dca376a342b4e5aee53d0c204f2