Merge changes from topics "splash_api_sc_a2", "splash_api_sc_a3",...

Merge changes from topics "splash_api_sc_a2", "splash_api_sc_a3", "splash_api_sc_a4", "splash_api_sc_a5", "splash_api_sc_a6", "splash_exit_sc_a1" into sc-dev am: 24764efd am: e6e7df0f

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

Change-Id: I3c522f6304d0392bdcef34c758e6e7153da38067