[automerger skipped] Merge "Support profile policy rules as a resolvable...
[automerger skipped] Merge "Support profile policy rules as a resolvable error." am: 7bd2985f am: 5d827a9e
am: c549e5fe -s ours
am skip reason: change_id Iba9ad071500bffef59014ddce357a0636106f002 with SHA1 f1c53d58 is in history
Change-Id: I4673d8aae37f0f5bc61cd1589e5a1aef6a48c435