[automerger skipped] Merge "Allow defining neverallow in packages other than...
[automerger skipped] Merge "Allow defining neverallow in packages other than android." into rvc-dev am: 735be9a3 am: 15ae8f94 -s ours
am skip reason: Change-Id Ied07cd33afa537f9d7aa3c33e59f4ac985901a0f with SHA-1 c5570ac9 is in history
Change-Id: I1422ccae8e49ee717d746c69879d4711d87eb7e2