Merge "Merge changes from topics "am-ad04c8ad832c4674be35bfc5fe4280dd-rvc-dev", "sp21-api-review-feedback", "sp25-networkstats-rename" into rvc-dev am: 3a6a98f5 am: 11457de1 am: ae1d8a96 am: 4707837e" into rvc-qpr-dev-plus-aosp am: 5ca6fc74

Change-Id: I3cf66c91f825ce58b7f1fc6d7f8144fa86145912