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

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



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