Merge "Don't call into VrManagerService with AM lock." into nyc-mr2-dev
am: 2bfb3155d9

Change-Id: Iea925a8edd6485fada6c3ed06accd07f5284b567