Merge "Only update lock icon views on the main thread" into sc-v2-dev am: 29608606 am: e3aaed48

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

Change-Id: I9b41411ad0f6374c73993effc5d0e29c03f3b192