Merge "Fixes for Test App e2e working and UX polish." into sc-dev am:...

Merge "Fixes for Test App e2e working and UX polish." into sc-dev am: 44061d90 am: 384000d1 am: 4833e224

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

Change-Id: Ib01bf65692ff5eac3cb6588aab780d246f376d55