[automerger skipped] Update Redbull SVN to 31 am: 4bbf855905 -s ours am: 817d800d7c -s ours am: a9d36bedc1 -s ours am: 2b4b3c3741 -s ours

am skip reason: Merged-In I0f122c5f297f3bb7f3e84e70fa5c779041a0fb7a with SHA-1 bff21023af is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/redbull/+/15547672

Change-Id: If831a9321dbce4dc1f40ade1f5f6275b11d0247d