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: Ic9681e2805103e08d54fcdbbaa49be8a70b22437
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>