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

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

Change-Id: Ifbde38a339e107c0fa9378034abc746fea7c2d3e