Merge changes from topic "wifi-data-activity-model" into tm-qpr-dev am: e2ccdcbe am: 2557607c

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



Change-Id: I4ba8e6d1557a742025066830b834204050b729b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>