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

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

Change-Id: I6115f4ed727a78f5ed800e7e254913220d1d5bec
tree: fb64486b7f967a454844936abf863199e0c66d04
  1. core/
  2. services/