Merge \"nfc: allow access to drmserver_service am: 479712b0 am: 9bf95372\" into nyc-mr1-dev-plus-aosp am: cce23e50 Change-Id: Ibd643d81d3fd1cdf24c7d86b9affbc158a0f20d1