Merge "Logtags for com.android.server.policy"