[automerger skipped] [DO NOT MERGE] Jump SVN to 7 for VZW EMR am: 2bc9d4dab1 -s ours am: b2bf7cacdf -s ours

am skip reason: subject contains skip directive

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

Change-Id: I98c6ccfaa3b402e7bdb10dcc76fc1787691f5cf7