tree 2271e50b1863ba007f8262fe8c78b6104a0a8da1
parent 2a812b7fd04a13e99d4516a0d18f471c69249ed9
parent cf9644b0d9726a85f6b2b8c178b20c37122258d0
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1576098161 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1576098161 +0000

[automerger skipped] DO NOT MERGE: Fix various settings chassification bugs am: 2d23f495ff -s ours am skip reason: subject contains skip directive am: cf9644b0d9

Change-Id: Ifbfbc37bca95ee2314769ad038e65d3c874e575f