Merge "DO NOT MERGE: Updating CTS Security patch to 2017-01 am: 926d43e4f2  -s ours" into nougat-cts-dev