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

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

Change-Id: I3e36529b0795d9a3109537737ef9a3b9421da3db