Merge "Tuner APIs: add locks to avoid crashes caused by NPE" into sc-dev am:...

Merge "Tuner APIs: add locks to avoid crashes caused by NPE" into sc-dev am: d7d85eb1 am: 21affc98 am: dbc34553

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

Change-Id: Ica2896d9de70c8bf8c46278b138e0f330d18130f