Merge "TintController: add lock to fix NPE problem." into main am: fb060b2862

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

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