Merge "Only show app icon + limit 2 lines toast on targetSdk S+" into sc-dev am: f010ed63 am: f4bad3f7

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

Change-Id: Ia34ec268d16eed32e65a91da2da5b1e86bd93abb