[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 128d9d29db -s ours am: 0620a6720a -s ours am: 0cc94c1187 -s ours am: 39b2a310f7 -s ours

am skip reason: Change-Id I0af7dcf183c7ffe110590e539177bbc7ff69cb27 with SHA-1 cfee8e1cf6 is in history

Original change: https://googleplex-android-review.googlesource.com/c/device/linaro/hikey/+/12469995

Change-Id: I07cdf7ebb7ae19bd42f790d2d4c57b287786c156