Merge changes from topic "ms52-movenetstats" am: a45c0d91fa am: dde9b1031c

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

Change-Id: Iddf4ba9b30accfdda6d41a7e97fe24541567cbfb