[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 70bf1e5994 -s ours am: c3165142cf -s ours
am skip reason: Change-Id I49c82ad516931b8a7c90dc446a5df5e6ee52e56f with SHA-1487d9e6e24is in history Original change:12470115Change-Id: I0810bcfb7c472c4f4a20b5f91e3c781e2dd610bd
This commit is contained in:
commit
c03004241d