Merge "Clarify SELinux service error message" am: 54a28300b7
am: 706a898cd0

Change-Id: I3ab507e09016b94efb1440a4ad77a03918d361a5