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

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

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



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