[automerger skipped] Merge Android R am: 0e2a02db30 -s ours

am skip reason: Change-Id I08ba9038c15f54bf2313b1a741b49b239480c21a with SHA-1 3442d4619a is in history

Original change: https://android-review.googlesource.com/c/device/google/muskie/+/1422298

Change-Id: I4beaf4ecae9830e09bf1f07337adc1a09a8bd379