Merge "Merge "Color of the ring around the lock icon" into oc-dr1-dev am: 0903e31e" into oc-dr1-dev-plus-aosp