Merge "Add CTS for bug 170240631" into oc-dev am: da9c908117 am: 2c5ea8ce16

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12794741

Change-Id: Ie451e491afc9ff06707699e4be0a29e5145a14bf