[automerger skipped] [DO NOT MERGE] Jump SVN to 6 for Non-VZW EMR am: 1845dfddbc -s ours

am skip reason: skipped by user robinpeng

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

Change-Id: Ib70d3c3e7bc97ce255c861abff4d708cd66e4fa3