[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: 0b3d066d -s ours am: fa94b746 -s ours
am skip reason: Change-Id I97e8e0ec7b68699838595c09a4a8e7c7eef657c3 with SHA-1 d03d42b5 is in history
Change-Id: I1c605c29e9b2a80d4f5c407aa34b85b2019ea019