Merge "Remove the owner for settings_enums.proto" am: 11e5ef318f am: b619341566

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856038

Change-Id: I40599bac95425b8d62aa17f6759381ba657905b4