Android CTS 7.0 Release 16 (4438873)
Merge "Snap for 4438683 from 20d472e241efdbd9754d25a6540f4f7b1819b8e0 to nougat-cts-release" into nougat-cts-release