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

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

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



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