[automerger skipped] Merge Android R am: 7b0f618802 -s ours

am skip reason: Change-Id I8de2fc066c5bde667983942a4239946136781c11 with SHA-1 e695f3af21 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/vndk/+/1422475

Change-Id: If73040b2368011c6f7040d8d6a78d1e36806623c
tree: c64bbcfc6a1216e120bf8e65d46f783d22996aaa
  1. apex/
  2. Android.bp
  3. OWNERS