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

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



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