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

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



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