Merge "Add test for activity leaks" into rvc-dev am: 1c5d9ed8 am: 8e5e7c62...

Merge "Add test for activity leaks" into rvc-dev am: 1c5d9ed8 am: 8e5e7c62 am: 2ec5d7e6 am: 647dc47d

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

Change-Id: I5eaa00046b38d06a6b0976032aa8a545fa1647d6