Merge "move icon so that inline actions in settings can use it" into oc-dr1-dev

am: f104b68a04

Change-Id: I83321a143a402f0babebca140a01bdacf26feb4d
This commit is contained in:
Salvador Martinez
2017-07-25 00:05:01 +00:00
committed by android-build-merger