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: 2eaa190d am: fd4d9085 am: 3f863ef4

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



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