Merge "Fix some views not being tracked" into udc-dev am: f0e955ec am:...

Merge "Fix some views not being tracked" into udc-dev am: f0e955ec am: 27b054f1 am: 96f38996 am: 6853977c

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



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