Refactorings to clarify settings code

Refactorings to make what config comes from settings more obvious. Minor
other fixes. No significant functional changes intended.

Test: TBD
Bug: 200279201
Change-Id: I7a1a104eb1d798794ce14b5bb6ee7f0743f1da17
8 files changed