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

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

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