Assign local device portId 0 am: c8adf1f70e am: cc03484e9d

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

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