[automerger skipped] Merge "Expand neverallow for sdk_version: none" into...
[automerger skipped] Merge "Expand neverallow for sdk_version: none" into rvc-dev am: 846101ac -s ours
am skip reason: Change-Id Icaece0d9797bace8ae9741f7a029b9ea57fcbbb9 with SHA-1 45376407 is in history
Change-Id: Ia6732b5ae9560b157c94f70bdf174873298eee14