Merge changes from topic "ms52-movenetstats" am: 46d003e258

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

Change-Id: I20304b5f7dcf214ff4cc7da0cb142d2b3fd57211