Merge changes from topic "ms07-movestats" am: 942c713c9d am: cbc9da2aa2 am: ebca794eef

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

Change-Id: I05affe3c40f5d41e5c6e0bdab8f6d0581c90209e