Merge "Align main thread checking by calling ThreadUtils" am: 48c386e5 am:...

Merge "Align main thread checking by calling ThreadUtils" am: 48c386e5 am: 170a632a am: f97d2d6f

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2276131



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