Merge "Fix status mismatch in TunerCallbackAdapter" into udc-dev am: de51a7e2

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



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