Merge changes from topics "caitlinshk-wifi-screenshot-coloring",...

Merge changes from topics "caitlinshk-wifi-screenshot-coloring", "caitlinshk-wifi-screenshot-shared", "caitlinshk-wifi-screenshot-wifi" into tm-qpr-dev am: 2e6bfea1

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



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