[automerger skipped] Merge "Clean up BLOCK_ACTIVITY_STARTS_AFTER_HOME_FLAG."...

[automerger skipped] Merge "Clean up BLOCK_ACTIVITY_STARTS_AFTER_HOME_FLAG." into sc-dev am: c8d8b7cd am: 3d5a5b67 -s ours

am skip reason: Change-Id I01625843f67b00e5901833cff99aec16c1287a0c with SHA-1 5897ecc6 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I205f0d6388066f168a6ab5377e3f67c86c0a9fbd