Merge "Avoid onDestroy content in test" into udc-dev am: 248d90cb am:...

Merge "Avoid onDestroy content in test" into udc-dev am: 248d90cb am: d64ffe48 am: 7170bfc3 am: 8b0ef796

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



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