Merge "Fix ATMS#focusTopTask set to PiP task even the activity is not focusable" into udc-dev am: e10f63b4 am: 145cb10c am: fccbe66b am: 051e8620

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



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