Merge "am: Fix the privacy guard notification" into cm-10.1

Change-Id: Ia7a0fce1ff4395f0b04577ec6c18a2a8cb4384ea