Android VTS 12.1 Release 4 (9195718)
[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 1d67e7fe70 -s ours am: 1080b2f7b6 am: 1b12660791 am: 3e1d1fd459 -s ours

am skip reason: subject contains skip directive

Change-Id: I4cb95917aa4ce2abd4dd9654ca888e9891b648cf