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

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

Change-Id: Id925979c238c8ae482dbb9c78bf7f4e0f27255d6
tree: 043fbc0c2c522237b269be7348e483cd56786241
  1. core/
  2. services/