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

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



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