Android CTS 14.0 Release 2 (11179914)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24595435', 'googleplex-android-review.googlesource.com/24605868'] into udc-release.

Change-Id: I18189229c860401da0c3050b2ac73ad6facc1dac