[automerger skipped] Merge "Merge Android R" am: ff647abead -s ours am: 7f19b90148 -s ours

am skip reason: Change-Id I58746745416a0abfe332709351ed21a99f5abd3b with SHA-1 62a7548a53 is in history

Original change: https://android-review.googlesource.com/c/device/common/+/1421856

Change-Id: I2d5b550a4c13a8a9f57f4afdcdcfb65e5a466c26