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

Change-Id: I2214556e60abce3bf0801bc01d86e8c481e44c38