Merge changes from topic "ms07-movestats" am: 942c713c9d am: 6d0a6803c9

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

Change-Id: Ieac82283e7f0a3cfdaceaff44bdabb3b21587c03