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

Change-Id: I0011a18045f824ded59507cfced49f5d540ae730