[automerger skipped] Merge "Support profile policy rule as a resolvable...
[automerger skipped] Merge "Support profile policy rule as a resolvable error." am: 997a8885 am: 49f1e3aa
am: 2d0f27f2 -s ours
am skip reason: change_id I37a365bce2eb183161a2649ca8098504b6ed2370 with SHA1 881fe4c8 is in history
Change-Id: Ia4e96a64d6f43e3493ec2f454666d39cd8acd7d4