Merge "Merge "DO NOT MERGE: Test for bug 32915871" into nougat-cts-dev am: fbd3b44a04  -s ours" into nougat-mr1-cts-dev
am: d8f9a3068b  -s ours

Change-Id: I57db754095602f1df90161b0eb1e786946af325f