Merge "Actually read config_showActivity in the signal policy" into pi-dev
am: 42b5621e12

Change-Id: I9b138d49d041263e08781a8a70b6320a98848e1b