Merge changes from topic "am-6a6e230918694e3c86e11859c011628c" into rvc-qpr-dev-plus-aosp

* changes:
  Merge "Add test for activity leaks" into rvc-dev am: 1c5d9ed8 am: 8e5e7c62 am: 66a262da
  Merge "Get the instance count as the initial value" into rvc-dev am: d5fb11a7 am: 3aac79bd am: 123612f7