[automerger skipped] Merge "Clean com.android.neuralnetworks APEX whitelist" into rvc-dev am: 89030a31 -s ours am: 7e35069f -s ours
am skip reason: Change-Id I1babea6c221dec1cd5364250d09f5ea541494942 with SHA-1 2bce0e80 is in history
Change-Id: Id6b41aa8c89332c10a024d28125da5a2bdfee327