Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev
* changes: Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev am:1fd90c968d[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am:afb3e84599-s ours
This commit is contained in: