[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: f61cc72f -s ours

am skip reason: Merged-In I01625843f67b00e5901833cff99aec16c1287a0c with SHA-1 dfebe6bd is already in history

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

Change-Id: Ief1c9793fbf16eed2e725c1f52d1963d23cd1a02