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

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



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