[automerger skipped] Merge "Logtags for com.android.server.policy" am: 29d2b05194 am: 59dcacc84d
am: aa6e045df2 -s ours
am skip reason: change_id Ida903499e9af8650299e3965787b4ac966b66915 with SHA1 6606d8df32 is in history

Change-Id: I3f751f86d6f721ec533c4304141b175d23e20fc2