Update settings together with framework changes

Bug: 120578823

Test: builds, behaves as expected
Change-Id: Id7fd84069c725cde3ed2c38060ab6a636066fcfa
2 files changed