Roll forward with fix for PreferenceInflater

Change-Id: I06402bfb9d93f384a4f867569af280ca02cab929
Fixes: 74950017
Test: Settings > System > Developer options
3 files changed