Merge "Fix possible NPE when matching accessory version" into rvc-qpr-dev am: 01f8961bce

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5379f67519077a60ac692babb18ba74a6ab23cb6