[automerger skipped] Merge "RESTRICT AUTOMERGE: Fix CTS." into nougat-cts-dev
am: 426eef3fc7  -s ours

Change-Id: If3503f5251bc66fa742828729298413e1e746a99