Merge "3-button mode tests close app tests" into sc-dev am: 5ec748f7 am: 5bfeb6f0

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

Change-Id: I3776f67e158f738469f46bbaf615daa05535cd65