[automerger skipped] [DO NOT MERGE] Update SVN to 6 for Oct SMR am: 1bebe31d0d -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7087347ecd65791cb49b5b0d8649dca123abb5c3