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: 569657b9 am: a9054118

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

Change-Id: I2ee278baef2857452088923a61c60c7d6f26a261