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