Merge "Check if the view can be recycled if viewId is set" into sc-v2-dev am: 8b5c93d9ea am: 5df3511ad7

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

Change-Id: I9fb4df9313fe4c87b901ab0288e152809a100a74