Merge "canBeModified accessors for AmbientDisplay pickup setting" into oc-dr1-dev am: 7c9a6b502a
am: 804322ee01

Change-Id: I19c58b8be852ab0a705b02f02d0b712bfefd3458