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: 5b463f9b am: 8a9cc5e4

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

Change-Id: I88e9b2e568c78e49d715ff2ecd92338d7df8414d