[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: 960c2065 am: 22bf51ed -s ours
am skip reason: Change-Id I97e8e0ec7b68699838595c09a4a8e7c7eef657c3 with SHA-1 d03d42b5 is in history
Change-Id: Ic4e4709b5f8de7bba26c50886d0ed211057958ff