Merge \"Add DUMP permission check to phone service.\" into nyc-mr1-dev
am: 6e8937cf06

Change-Id: Ie4a5bb283d93705aac521a7e469c5507db6d6e5c