am 9395dab7: (-s ours) am ff3362f0: (-s ours) Merge "DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front."
* commit '9395dab7c38d540bea926307c448d5cc5032ac7d': DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front.
This commit is contained in: