Merge changes from topic "wifi_tracker_bg_thread" into tm-dev am: 6161f03b

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

Change-Id: I20c48ceaf7f17e9ed653e9adbabae352a1da1b3a