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

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



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