Merge changes from topic "ms52-movenetstats" am: ca25ad3567 am: d94a6ca17c

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

Change-Id: Iddf4ba9b30accfdda6d41a7e97fe24541567cbfb
tree: 89fffe8e8efeb6d5f67e2e7ca3de3e68f530db8c
  1. framework/
  2. framework-t/
  3. service-t/
  4. services/
  5. tests/