[automerger skipped] AudioDeviceBroker/Inventory: fix misc error-prone warnings am: 4f301b43 -s ours

am skip reason: Merged-In I4ec5133fae2e184cadf651469e7fcff3db66ea1d with SHA-1 08366e4d is already in history

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



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