Merge "Annotate NSM heavy methods with @WorkerThread" am: e096339dc3 am: 6e3de2d9b6

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

Change-Id: I4091f82e7b95901a88cd9528c92df4519fb3edd1