Merge "Logtags for com.android.server.policy"
am: 87c2aa77a1

Change-Id: Ic10b619bf21509aa0740ecf0c5dba6d422e47c92