[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 594ab4f027 -s ours am: ea1973d083 -s ours

am skip reason: Change-Id I670b163eede4bb60c197e2ded9491d45ad4b6541 with SHA-1 2ee513caf0 is in history

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

Change-Id: Ic4c6c3d502d5752c0e4458e5e5424299a512128e
tree: 703130dd9b051b0f64dd23f4d9c9e2d2a01e70c0
  1. hikey/
  2. hikey960/
  3. update-prebuilts.sh