Merge "Revert "CTS test for Android Security CVE-2018-13895"" into oc-mr1-dev am: 46b7a0d3eb

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

Change-Id: I7f6b9ccc59ba00de7751feb9140f9e0c1c9979fb