[automerger skipped] Merge "Pass Device bus ID from native to Java" into main am: a3bbef4aaf -s ours am: 2cdb3ce829 -s ours

am skip reason: Merged-In I0ff2e31d7a8b610b0e1208cc5c444d1f785e162c with SHA-1 b4015294e1 is already in history

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

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