Merge "Merge "Disregard closing activities when blocking previous activities." into oc-dr1-dev am: f1f25ad5f2 am: b23ad33d58" into oc-mr1-dev-plus-aosp
am: cb22ec811f

Change-Id: Ia0388c3c3b45ec9fd16fe4006484f4ca21f2bc8b