[automerger skipped] Merge changes from topic "ms52-movenetstats" am: ca25ad3567 am: d94a6ca17c am: d1e7bd6099 -s ours

am skip reason: Merged-In I5676f883141afca1511c425b7c36683a6c6bfb9f with SHA-1 889703ce18 is already in history

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

Change-Id: Ieb9574d65967b483320171c40d32efe8f754e1c1
tree: 551199e1ebbe24ec8cd2e280c4e5b7dd4f9f708c
  1. framework/
  2. framework-t/
  3. service-t/
  4. services/
  5. tests/