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

Change-Id: Ibb24ab19174b701d32a978b76b336c1c84d4f2ff