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

Change-Id: I40ced751c59fbc10d0a23a3e06fe66cc59eafd17