Merge "Logtags for com.android.server.policy"
am: 29d2b05194

Change-Id: Ic10b619bf21509aa0740ecf0c5dba6d422e47c92