Merge "Fix ATMS#focusTopTask set to PiP task even the activity is not focusable" into udc-dev am: e10f63b4 am: f450b807

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



Change-Id: I8e20841ac0593a6c2f263f12c8557657a277ccd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>