Android CTS 8.1 Release 21 (6952965)
Snap for 4399693 from 93f4989c6b60ce38f1dae5dfad26c1024dcfb30b to oc-mr1-release

Change-Id: I9efe9c810b9303d22080afd1a0969d49a64d14b8