Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into sc-dev am: 9eba99f4

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

Change-Id: I0c4d5ba595c4f0f06ad857617824fc44fe3f2950