[automerger skipped] Merge changes from topic "ms52-movenetstats" am:...

[automerger skipped] Merge changes from topic "ms52-movenetstats" am: a45c0d91 am: dde9b103 am: 8b0fe4e8 -s ours am: 14b5b707 -s ours

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

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

Change-Id: I5b2a4ddb78be2a099007cb444df535699a1452b2