Merge changes from topics "icon-interactor", "wifi-networks" into udc-qpr-dev...

Merge changes from topics "icon-interactor", "wifi-networks" into udc-qpr-dev am: 0ee361bf am: 39e8cec9

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



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