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

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



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