Merge "Allows nfc to access vr_manager_service" am: c3f4afefdb am: f23230c88e am: e95974b024
am: cd59148309

Change-Id: If3b128bcc0dbeb043f9476c28334d83912ed53e4