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

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

Change-Id: Iab6224bde3b4627aa752e288a3a5f6a4bb81f49b