[automerger skipped] Merge Android R am: 7a56081cce -s ours

am skip reason: Change-Id I5ba640a8fb8b578755c1a7366d368ef1d81f7160 with SHA-1 f43d76b40d is in history

Original change: https://android-review.googlesource.com/c/device/google/taimen/+/1422328

Change-Id: Ic93a14028a22f1f73ce47d7c128bffcdbe5b77a2