[automerger skipped] Merge "Re-enable ElementTest#elementIsReusedBetweenScenes" into aosp-main-future am: cdd45525c4 -s ours

am skip reason: Merged-In I7540b3265d501c086cd39e7e6f57309fb702abfb with SHA-1 08e50b87d9 is already in history

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

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