Merge "DO NOT MERGE: Fix the correct front stack id in all modes" into oreo-cts-dev am: 5b2e8c0195  -s ours am: f99784bf4b am: 00684ac452
am: 978d821b2a

Change-Id: Ie0a633ba0bfee9b6e33cf4f5b9d8ff3970262d01