[automerger skipped] Merge "flexibility for having extra policy files" into...
[automerger skipped] Merge "flexibility for having extra policy files" into rvc-dev am: b27ef83f am: 165dedf2 am: 37c680bf am: f8fd0cb5 -s ours
am skip reason: Change-Id I97e8e0ec7b68699838595c09a4a8e7c7eef657c3 with SHA-1 11c1a687 is in history
Change-Id: I4b5202cb2d13f4000f8c2ac5f7c61b80a8f32539