Merge changes Ib3183329,I9b433cfd into android12L-tests-dev

* changes:
  Exclude three tests in ActivityLifecycleTests
  Exclude two tests in ActivityTests