[automerger skipped] Assign local device portId 0 am: c8adf1f7 am:...

[automerger skipped] Assign local device portId 0 am: c8adf1f7 am: cc03484e am: d60d3a97 -s ours am: af616590 -s ours

am skip reason: Merged-In I99e1ca1d54a74682c0737deb2ad2163f7db5e0db with SHA-1 69229e31 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2002570



Change-Id: Ibdd335ebcd169ffb23e37985f145271d5cadbeb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>