Merge "Fix ActivityOption#setTaskOverlay can be covered by other activity." into sc-dev am: 9a535ee8 am: 80f7d1d8

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

Change-Id: I8a706cfa5db74fdcbd30c4a2c3d7a9753cf9a6c2