Merge "[snapshot] skip onChanged() in Watched* snapshot()" into tm-dev am:...

Merge "[snapshot] skip onChanged() in Watched* snapshot()" into tm-dev am: cd58d789 am: 8d289773 am: e10b5499 am: 57108b19

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



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