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

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



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